GtkAssistant: Don't use a draw cb for the sidebar

We can do this with css nowadays.

diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index ac85fc569b671ea602056179f65ea29d0d0e28bf..0e3f7cb37042c3abfbf08a2c48b42784f3a59d88 100644 (file)
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -171,9 +171,6 @@ static void       gtk_assistant_do_set_page_side_image       (GtkAssistant  *ass
                                                               GtkWidget     *page,
                                                               GdkPixbuf     *pixbuf);
 
-static gboolean   assistant_sidebar_draw_cb                  (GtkWidget     *widget,
-                                                             cairo_t       *cr,
-                                                             gpointer       user_data);
 static void       on_assistant_close                         (GtkWidget     *widget,
                                                              GtkAssistant  *assistant);
 static void       on_assistant_apply                         (GtkWidget     *widget,
@@ -615,7 +612,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, button_size_group);
   gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, title_size_group);
 
-  gtk_widget_class_bind_template_callback (widget_class, assistant_sidebar_draw_cb);
   gtk_widget_class_bind_template_callback (widget_class, assistant_remove_page_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_assistant_close);
   gtk_widget_class_bind_template_callback (widget_class, on_assistant_apply);
@@ -1069,23 +1065,6 @@ alternative_button_order (GtkAssistant *assistant)
   return result;
 }
 
-static gboolean
-assistant_sidebar_draw_cb (GtkWidget *widget,
-                           cairo_t *cr,
-                           gpointer user_data)
-{
-  gint width, height;
-  GtkStyleContext *context;
-
-  width = gtk_widget_get_allocated_width (widget);
-  height = gtk_widget_get_allocated_height (widget);
-  context = gtk_widget_get_style_context (widget);
-
-  gtk_render_background (context, cr, 0, 0, width, height);
-
-  return FALSE;
-}
-
 static void
 on_page_notify_visibility (GtkWidget  *widget,
                            GParamSpec *arg,

diff --git a/gtk/resources/ui/gtkassistant.ui b/gtk/resources/ui/gtkassistant.ui
index f23574164cb3b38091a26cfb94a538ab117be9a6..6c0937350bcbb2d4ab7c54cd013f910dd3bc68ee 100644 (file)
--- a/gtk/resources/ui/gtkassistant.ui
+++ b/gtk/resources/ui/gtkassistant.ui
@@ -24,7 +24,6 @@
             <style>
               <class name="sidebar"/>
             </style>
-            <signal name="draw" handler="assistant_sidebar_draw_cb" swapped="no"/>
             <child>
               <object class="GtkBox" id="sidebar">
                 <property name="visible">True</property>